Refactored Cmd!
Further Refactoring!