Added Generator
First working version