Started changes to motion system, not really working, needs more thinking