@theopolis would really appreciate your comments/buy-in before working this into a mergeable state.