Make geomtrySpline non-global
Add speed control