HACK FIX SYNCH BUG - DO NOT MERGE
moar WIP