Stuff I forgot
Fixed merege
Fixed duplicate require'd statements