In progress edits to export side