Tweaked everything so that this would be ready to be an add-on and for a
blog post.