Should I move it there with this PR?