Refactor out renderer

Loading and error tests and failing