Not done. Other refactors make the fields needed in the public scope.