Move the draw logic into a function of its own.
WIP.  Don’t push live, but try to debug.