Idiot.
Fixing how we work out what to deliver.
Getting rid of dependency on time formatting.