Finished Generator declarations

Ready to develop