Oops, I got a little carried away.  Can I just fix it in my branch?