added a bunch of stuff
added a bunch of stuff