Added more moves, removes multi-attack class