+1 here (we talked about this over HipChat previously - thanks for cleaning it up).