additional tracks

Changed to allow additional tracks initially. Kinematics calculation
should now work with the new code (possibly not)