MPI stuff seems to work with the changes on this branch