Get song playing oo version working
Merge branch 'master' into SongPlayerTesting
Getting everything fixed up