Working on music app; fixed model