Buncha stuff
Fixed merge conflicts