Clean up
Another re-organise
Removed hardcoded commands.
Organise command implementation
Fixed command handling