This was all work done previously by @hswong3i in https://github.com/weaveworks/weave/pull/3939 All credit to them