Pulled factory function handlers out into it's own module. Still not sure about that pattern. Made lists sortable/whereable