Started real di refactor.