test
Revert "test"

This reverts commit a812c1888f78e115af8f065d6e9064523e163941.
Merge branch 'scrolling_witg_bugs'

Added scrolling, some bugs left