Andrew's work on conversion to the formula parser