9th Commit

More generalizations and improvements to the code.  A half day check in.