Begin changing to a Layout approach.
More changes for DataReaders.
More Layout changes.