Add some base classes and stuff