One small step for man -- rewrite is slightly more correct (and a lot more complex) now. Obviously it doesn't work yet.