Mostly working - breaks when offset changes now