Work on classes and commands