Refact. due to prot changes, added groupjoin + tests