WIP: new S-Curve implementation