Added in basic filtering.