Need to test more and cleanup but the scrolling might finally be usable