Complete dr1 refactor, need execute test.