If this stuff is going to move, is there a reason why we want it to come in with this PR?