Add visitor for testing
Fix sort on file import
Fix save on import
Rebuild and test