Over breakfast, I'll raise a PR to combine these and address feedback.
 good ideas!