added lots of stuff
added lots of stuff