Started on refactoring to use a DOM walker instead of the previous searches...