Did a bit of draw code reworking