Almost have the Date selection working