initial
lots of stuff. kinda final
Merge branch 'master' of https://github.com/spiersad/project4