Forgot to commit this long ago, not sure how.  Here it is.