Added class support
First commit
First setup