Add in recently re-written Jukebox (refactoring FTW!).