branching + mild documentation