Implementing Friends
Merge fix