WIP - More refactoring and initial structure for filtering lists.