Finished implementing it.
Merge branch 'feat/offset-by-timestamp'