Third sync

Moved stuff around