beginning to clean up scrolling