First commit in a while, switching to jukebox code, working on web