branching wip
resolving false branches
writing json along with raw
reorganization