Syncing my state before starting to reorganize the UI parts of the source...