Some progress but incomplete gstate -- in-progress