Removed all command classes, added command methods.
Got tests to pass.