move on class code to OnClass project
finish first version