Nicely done!

Initially I recoiled at the thought of the stiffness of the CD, but of course your absolutely right, at least for 2d manifolds.