v2 initial work
v2 fix group headers