Start work on rewrite