Another epic refactor. Started out trying to pass failed unit test, and
which pushed me into fixing known issue - whcih was fdo.read always gave
last unit which isn't desirable