Added support for classes (Bart kind of TDD-forced me to do so :).