Continued refactoring with Sync library.  Getting close - the next step is to fix map loading.
Commit because harddrive makes funny sounds.