complete revision - intermediate

Completely revised so there is a single testing world.  partially
working