Adding alternative solarEnvelope and solarFan components

Ready for testing.