Move kinematic stuff to kinematic.py