Issue #1 - exporter almost works...