Made a lot of progress on the renderer