SYNC-1268

I'm not sending this to Mike yet. Let me know if this architecture works for you.