finally managed to get the dates working. 

Well, they probably work - kinda hard to test at this point.