[6m] Major rewrite, import rewritten, now wizard based