add objectId recognition.  make nulls actually nulls.