I think what you suggest sounds fine, @cam156.  Maybe we don't need the enable flag at all.