Extract .command from Client
Clean up transposing methods in Command