Adrian is the developer of the Waiwera parallel, open-source geothermal simulator, and adding capability to Waiwera for modelling superhot and supercritical geothermal systems. The main new capability needed is in new equation-of-state modules for supercritical water and also mixtures of supercritical water and air, allowing users to create Waiwera models containing very high pressures and temperatures, while also simulating processes in the vadose zone containing air near the surface. The other new feature to be added to Waiwera is temperature-dependent permeability, to model how permeability is altered at very high temperatures in the brittle-ductile transition zone.