Finish up buying Pokémon.
Add the type-cell class a few places it's needed.