Latest from part 1 + some EVL customisations in exporter.