Bundle parser

Bug Fixes. Added a parser.