WIP adding exporting feature