Work in progress, better synchronization maybe, moving stuff around
Synchronization still a work in progress