Final commit - filtering fixed, everything works.  Is awesome.