Added some more base stuff