I guess this is the "last" issue. Besides looks good to me. Once you're happy tell me I'll do another round of review and merge. thanks for taking a stab as this.