Updated 1-minimal codebase with a new rewrite