Refactor Adventurer
Refactor Rebuild to Use Discard Service