WIP - testing gnacs refactor