Added some more basic stuff