re-enabled generator class. Cmds work don't puke, but I broke the functionality. Needs more work; however, 'new' cmd has been refactored out of the class