Started a complete rewrite.