Started reworking the serialization.
One UGLY working version of the Row.Id issue.