x2g refactoring WIP
x2g refactoring WIP #2
x2g refactoring WIP #3