Added more classes (WARNING: not all tests passing yet)