Develop sync service manager

At a minimum the service manager has become out of sync with master causing bugs to re-surface. This PR is the newest service manager from the master branch.