Did a bunch of stuff. Probably final version.
Merge branch 'master' of https://github.com/Pirh/TeamOptimism