Stuff
Working
Fixed merge conflicts