This stuff feels like it shouldn't be coupled here.
Also, I see no need decouple it.
:cyclone: