Cleanup
Cleanup scroll stuff for merge to develop.
Prototype scroll stuff.