Submitted it here so that someone can review/add something much better.