Some of this should be similar to what is happening in staticannouncement, maybe move some of this to proxystore, so all the logic now lives in there? 
I think somehow this comment got lost, wondering if updates while somebody is reviewing messes up things!!