Reworked to be in terms of the more general DoFn instead of MapFn. Still having trouble testing effectively