Started substituting in logic for lineparser