added some classes and drawings