adding Domain support, wip