test branch for Jami

Hey I need a review.