More work integrating new render code and generally breaking everything else.