Fixes to import routine
Initialization tests now pass
Merge pull request #3 from einhverfr/master

fixes importing logic and initialization