WIP on another request I picked up. Inviting some input here if...