Getting ready to tag next version. Rewrite.