Work in progress on import/export functionality