Major refactor.  Loss of functionality.  Need to
re-import most of the control logic.
Updated dependency management