Progress on solar gen
Progress on solar gen #2