New Class Structure
Merge branch 'master' of https://github.com/gbarber205/final_proj