Added first phase of Bundle functionality