Crap, we probably need to do this for all of the drawing.