Temp adding W3 work

Signed-off-by: Peter Thiessen <peter@midokura.com>