Big change

Trying something different to decide sync - I bet this is going to cause me big pains