Refactor! All can now use filters, less redundant code.