Working on likes
Still working on #BH-31