Initial commit attempt 2 of mdp harness