First stage of T3 refactor.