Added branching implementation, no JSON for branches yet