Refactoring, early steps in implementing privacy throughout system.