Working on Command Handling

Working on Command Handling