Sure, I'd like to do that in a separate PR though.