First pass at import finished