Added four new dances, refactored some stuff