I like the idea but I think I'd like to push it out to a separate PR if that's alright.