Component trays that fit in the existing space for player and game tokens. Keep everything separate and easy to access.
