Big commit of pre-exam changes - added new metrics.
Didn't want to do this, but better to start from scratch.