Add command classes, and start work on cleancontests.