Added beginnings of filter lang.
Minor conflict fix.