Major overhaul. Almost finished!
Merge branch 'master' of https://github.com/Winston-Chan/CPSC449