Working on adding calendar selection