More work on Pokémon Report

Need to work on optimizations