STIR2 parsing done....
Merge with Zane's tests