Make some more progress. I need to get the scrolling stuff going next.