Added some base classes
Stuff