Reorganizing things to accommodate different Rendering modes. currently slightly broken.