refac(v2): wip