@parrish, this look good for #31?