Initial implementation of composite classes, some test coverage