Changed a bunch of shit.
Add calculation