Very much like your solution for this.