Added some classes adn controlling functions