Added some base stuff