Updating shit and stuff
Updating a shitload of stuff
Fixing conflicts