Refactor continuing... got ground showing.