All commands should be instantiated exactly the same way
Cleanup and doing some actual work now