initial refactor of h2 started