Another visitation reorganization. This time, I think it was organized correctly