Initial work on generator