some work on 0.91, on hold due to GES build breakage