Change out the math works

Added new features, and changes how to math calculates