this needs to be split into separate patches and the commit message
needs to be a bit cleaner.
Also is this in sync with the GISI re-write Aki is doing?
thank you for your
We are studying what Aki is doing and are in contact with him and will
get back to this.