start massive rewriting - this commit is in the middle of nowhere