Merged. Still many rough edges and obvious bugs or left outs.

Key: separating relays at the top level and bring kind-1 back in a Discord chat style.