added classes and rules from previous work