Fixes #11
Fixes #10
Fixes #7
Fixes #5
Fixes #4
Lots and lots of changes
Merge branch 'master' of github.com:jmh045000/utd_cs6301_project