Working scrolling and addition

Added in scrolling and cleaned up the code for easy copy paste, which is
next step.