Small changes to Sync again

Working on cleaning up CRUD.. wanted to sync before continuing.