@brettweavnet looks good to me.

@thbishop want to take a look?