Adding in basic filter logic