initial pass at adding filters