Finish code/prepare for team's class integration