Added branching, json

Haven't done anything with the test file yet