Commit #10: more classes