Initial attempt to get dates working (unfinished)