Initial re-commit of Relay

Ewwww...