Moved to new 8-data model, and extracted renderer for use