small changes, grouping is broken
add messaging threads