review code.
solve problems.
remove class code generator by will (but also thanks!)