init commit todo19, update todo17/jukebox