changed back to old program , was getting some seg faults out of no where from the old progprogram
Fixed merge conflics maybe?