Added a bunch of stuff
resolved conflicts