added some classes uncompletes