Better types, real dates.

MMP calculation still WIP (and surprisingly headache-inducing).