workign on encoding support for classes
mergine changes