Commiting hoepfully what will be, the last major changes.
These commits will at this point will either deal with detail
or the unexpected.