Refactoring, testing, cleanup, added music sync with dm feature