Added most of the draw logic #3.