switching to using FileBlockIterator for various bits and pieces
making small incremental modifications. Not to be used. Buggy
getting there with the refactoring but still buggy
small fix
More fixes
Small mods
Refactoring block handling. Almost ready to merge to master
small typo fix