Removed Spline stuff and started to work on a state machine