moved more classes from mission