Added some base classes to get things started