Managed to implement like feature after the lovely Mathilda sorted our git problems
Merge branch 'like_a_friend_2' into dev