Closing in on finishing the ISO 2007 MPE implementation

Signed-off-by: David Brainard <brainard@psych.upenn.edu>