WIP: removing Draw classes and replacing with single RenderState