Work on spline classes
More spline tweaks