Started Work on Generators

Also includes some collection stuff needed on the side