Merge branch `rewrite` into `master`.
Comments/Cleanup.
Messenger skeleton.