Started implementing bundle tree