Added a lot of basic stuff