Niantic has so far released several updates for Pokemon Go, but none of them brought the major new features players have been clamoring for. The company fixed bugs and added tiny improvements to the game in its recent updates for iPhone and Android. Meanwhile, a fixed tracker, support for trading Pokemon, and the introduction of legendary Pokemon have yet to be introduced — but these features might be just around the corner, according to a new report.

MUST SEE: Leaked photos of iPhone 7 in blue remind us of the biggest remaining mystery

Digging in the Pokemon Go code, users have discovered several hints that suggest Niantic is laying the groundwork to support the new features in upcoming updates. According to multiple Reddit users, Niantic will let you search for Pokemon creatures that other players are ready to trade, and list your own to be traded. Phrases like “Trade_search” and “Trade_offer” have been discovered in the code.

Legendary Pokemon are also en route, it would appear. A new placeholder called “activity_catch_legend_pokemon” seems to indicate that gamers will be able to catch rare Pokemon in the near future. Players will soon be able to select a Pokemon in the game and assign it as their trainer’s “buddy.” The Pokemon would then follow you and collect candies to evolve.

Other new features include a new kind of incense that will apparently let players attract specific Pokemon to a location.

Finally, a new VR folder has been found in the game’s code, and it references Google CardBoard. That means playing Pokemon in VR will become a reality soon enough, although we can’t help but wonder if that’s really a safe way to play the popular mobile game.