refactor code needing version
add OffsetFetch support
branch notes to be rebased away