WIP: add GS visitors