New basic filter logic in place

But not yet complete