Most up to date version (pushing to master)

Math errors still persist ):