Edited main class to create object generators. Still a little clunky, refactoring. Changed list and map objects to be more polymorphic
Injecting is private command boolean instead of setting it within the command class. Fixed tests to pass with refactoring differences.