wip - V2

ref https://github.com/canaryio/canary/issues/6