Fixing merge errors from last commit + Adding friends WIP