Needs tweaking and debugging, but everything is hooked up
Merge branch 'project_5' of https://github.com/swimmadude66/CS3220 into Project_5