WIP partial Commit for improoved Class Compiler