Cleaned up wizard functionality.  Added network support.  Added CM capability.