Generator command should be at least working now
Refactoring