i don't know that a re-architecture is really what's required here rather than a refactor