Clearing out the fsblog branch ready for a code drop.
CODE DROP - from fsblog + edits... half-way there I reckon.