Tuesday night pre-merge, most of group feature is complete
after mege and fixed conflicts