Switch draw to a new module pattern.

Still learning as I go.