More stuff filled in - changed order of operations for mathy