Refactoring a couple NIBs to add a new feature. Should’ve done this months ago.

Manton Reece @manton