I hope this has no merge conflicts
All should be fixed now