More massaging.
Minor massaging.
Turned Timings into an interface.