SO MANY STUFF WORKING
Merged and stuff