some skeliton commented out
slight refactor of generator methods