Finished lab, adding final layer of refactoring