Fiddle with displaying the g+ states.
Add some TODOs