Initial 1.7 commit...

Client -> Server sync is broken