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