MAJOR rewite of GSI config handling. Partial. #73