Continued work on report import. Untested