scrollTracking isn't part of this PR really, we can look at this individually afterwards?