feature/date-handling-revisited