Manual merge

Manually merged this with my local repo because there were conflicts with everything.