More moves to be a very abstracted renderer