New branch for capshare project