Starting full rewrite