Revert "Merging Stuff"

This reverts commit 74540905a239e7cd7d2ad3003b09dd1566df312b.
wut is this

gfdsgffadsa