Feature b

Noticed this branch didn't have a PR attached. Happy to help get this feature moving forward.