finish breaking out the date/number type logic to data_type