This is the meat of the proposal here. @kachok and @blacktm, let me know what you think of this approach.