added lots of basic stuff
added lots of basic stuff