Commit before re-factoring / cleanup - issues with jukebox.addAlbum()