Added the generator code
have to merge changes
yeah