added non-disruptive framework for upcoming MPI stuff...