G2D Refactoring
Text mode working