adding in code for class generator
fixing merge