working generator part 1
working generator again
Removed created wraps