Literally masterful merging stuffs

Like wtf github the fuck. I had to go through files and line by line
merge it.