Separated matching and slices out of bunch class. Slimmed down bunch class.