Refactoring, started group var int encoding.