switching branch_name to branch_id to keep things relational