Fixes #38 — new drawing architecture