Upgraded Example 3 and generators... ready to merge to main package?