@jcoyne does this todo fit the bill?