Initial though on relay messaging fix. (wip)