Added more functionality to import. Still not done.