Bunch of changes to various parts of code. Very simple filtering is
in place and working.