added a bunch of stuff and things
added a bunch of stuff and things