some more work on mocking stuff up; still have a bug with filter