Finished #7 Create enhanced class generator