SWEN-262 Refactoring Project - Team 9am Velociraptors