Tightly coupled right now to a specific use-case but might make it work in general.