Added ability to do repeats in observation matching and removed some unnecessary code