changed to datetimepicker (BORKED)
merge