start refactoring and cleaning up commands as per spec