move class-ize done, not test yet;