working out something
Added some classes