partial commit (not for demo); replacing timepicker