Got it working this time
Merge remote-tracking branch 'discover/ScrollViewWorks1'