Everything except for unbounded inline and pivot mappings now done
So near, yet so far, realised I can simply all this, so starting again
Major refactoring in progress still.  Nothing works.  Temporary commit as I'm half way through.