yep, sounds good. want to do it as part of this PR or a new one?