Fixed up the simple gas model so that it is more versatile (i.e. things can be changed). I still think it should go in another file though.... Need to think about that.