WIP: turn on GS, and mark GS stuff as untested for safety
Fixup a todo
Fixup another TODO