Update how offsets are dealt with

For #154