First changes towards a new friendship system. Not yet complete. Saving intermediate state of work