Added client command handler base logic
Refactored server command handler a little to use switch instead of if/else