Change importer to use dictionaries
Add complex import, 1 failing test