Initial JB commit for shakira