Modularized drawing logic into its own class.  Must be tested.