Latest working code base - datetimepicker needs fixing