Add speed calcs, deadzone