Moved some things to the Renderer superclass