class 3

after merge and some class work