Refactored drawing to prepare for overlays