We can add a datepicker (got a recommendation for that?) for the next iteration