[WIP] Update import tool to be safe

Still working on this, need to write unit tests - just wanted to PR my progress

closes #1681