Add bulk import, test et al.