Updates to kinematic solver implimentation