Refactored engine logic to calculate on a better, linear curve