Feature/bceastburn/syncserver

Cleaned up a lot of code after looking at Elliot's comments. Definitely test this if you can after you pull it.