SolarCalculator work in progress