Begun sorting out the Throttle code