Add the content filter

Add the content filter, needs a little more work