first rough version working
clean up additional domains management