Update to relay - mostly working.