Revert: Saving current changes to offset. Failed attempt. Possible revert point.

Just a checkpoint of progress. (reverted from commit 26cb514345b635f9b9f5c66e6e6ef6035cb31e8e)