I would prefer a rewrite, with just the minimal functionality we need to get it working