Doing a bit of cleanup and implementing some suggestions from R#.
Merge branch 'feature-jo-import-export' into develop