done part of import and added some test