Close to working version, milestone 2
Fixed session problem
Finishing up group merging