progress but still work to be done with scrolling