bunch of crazy changes. the WithStuff files, which were supposed to
maintain the old functionality while waiting for the new stuff to work,
are not working -- filtering is all messed up because state isn't saved
between filtering refreshes or something. created a
before_modularizing_and_breaking branch that should keep working in a
pre-refactoring mode.