Commit for desktop sync, working on #5