Readd some prexisting vistor logic, starting tests.