Add the ability to filter incoming data
Revert "Fix setting of 'trigger'"

This reverts commit e2531969bc842d50bac92f3f1df170e6e72e36fb.
Revert "Test seemed to be failing before test was set up properly"

This reverts commit e7552591afb33e67e5b49c40e4ec883246619fe8.