Generators are done but still have some errrors.See issue 4