fixing
ommiting
new models for groups and messaging