Created a bunch of stuff :)
Fixed a bunch of conflicts :)