Continue working on rewriting stuff