Working

Working copy, still a few outstanding TODO items, nearly ready for full
publication.