Added Formula and ugly formula parser