added more classes and shiat