Lots of changes. Music now works in service