Starts sort and filtering refactor