`remove-mp` merge

This does have a bug, as detailed in issue #28 , but it's also in master, so I think it would be better that we merge first, then re-branch to fix it. Yep.