started refactor
test
clean up pass on scrollview
clean up pass on scrollview
updating scrollview code