Feel like there's a way to tighten this code up because of the repeated structures. Not clear what's best just looking at it, so this is non-blocking.