Tweeks to naming and command method.
Implement basic command generator.