I'll do this with everything else in #4.