Cleanup
Add group name to header
Use jshare supplied data directly