lots, moved genre and sub methods into class