Total rewrite, basically