All tests passed, committing before switch back to kinematics branch.