progress on importing, still not totally working