Revert "Revert "Part of friends fuctionality""

This reverts commit 2c5053aa69af1ba7f468898f2261b202191b6713.