Early progress on #200, a lot to correct yet, then colour.