cds

bit of redesign => move the curve construction to where it belongs