experimental import branch
cleanup and clarification
Merge branch 'origin/import'