Started adding MPI stuff, not working yet