Doing it in this PR is fine since it'll be the first use of it, I haven't started on it.