develop
aa
add class 2 and 3
Merging develpment back into shinetech branch