added Screen class and prep for repaint