vertical scrolling
fixed merge conflicts
mostly working stuff