Bee: Refactored to new structure
NPSubgames: Collapsed general code into super class