refactoring
refactoring
refactoring
refactoring
refactoring
Major refactoring to support a more logical read structure in preparation for read timeouts