@mcolyer let's move the discussion into pull-request.