Drawing Update

Everything is different. Weep.
Revert "Drawing Update"

This reverts commit 4ad7239e6ef0c389b6accc7207801b00ad60917e.