Checkpoint of the second drawing tutorial.
Fix, factor, simplify, and be more consistent.
Fuss.