Progressed on pointers refactoring.