Finished up the channel filtering rebase. All unit tests are green.