Investigator created, deck refactored