Refactored drawing, refactored demos.