Branch commit Passes all unit tests. Still resorting to special python versions of getDomain to get around type conversion.