Files I updated early after the merge

You can ignore all but the last 3, the rest were me trying to merge the forks.