Pushed to experimental branch. Extended state vector for inflow/outflow/etc.. not working yet