Title: Addition of Equilibrium Air to an Upwind Navier-Stokes Code and Other First Steps Toward a More Generalized Flow Solver