More merges

I still have no idea what I'm doing