INIT COMMIT - encapsulated-3 plus….

multitudes of other changes that I never committed.