Expiration filter

Read comment above about putting it in the constructor.