just a ton of stuff, still not totally functional
Merge branch 'master' of https://github.com/glisom/EECS448-Final