Moved things around a bit to add gas-like properties to the gas block.