Remunge for MOD

For Robin (@rjc123) to review.

Errors file here: http://cl.ly/173g0j3d0J1K