Don't think we have design for this that we can move on.  Availability via raw at least helps...