starting data import script, handling domain in current implementation too messy
Merge branches 'master' and 'bydomain'