StringBuildering when we add in the new datastreams.
More clever search-replace when adding in the new datastreams.
Extracted a method object.