Went to town, sorry if I got carried away.

Mark or anyone - I've left a few comments in the ReST for places where I
could not make the particular feature work, or where I wasn't sure on
naming.