Add comment functionality plus some