Two Suggestions: Investigator Filter/Battle System