Started changes to get scrolling working
Sorted conflict