WIP on following
Adding following
Merge branch 'feature/following' into develop
merge