bleh
merge
working on basis line
working spline function