Feature/on time perf

This indicator is pretty involved - the comments should be a decent guide
Yes, that's a better pattern