Initial work on datamanager sync