Added time and date selection and commented out debug strings