handle batch imports
update tests
rebuilt