Continued refactoring, still in progress, code is broken.  Checkin to ensure code is not lost by system crash or otherwise.