Config shouldn't be needed actually
Tidying up a bit, adding separate date helpers