Added working parser bundle, needs to be refactored