Cleaned up the importer and exporter, started working on the merger