Started work on the export
Better output format