Social integration

Social integration & code cleanup