data. Made a lot of progress on #1 with additional work on the rendering templates.
Supports issue #1