More coding on SolarCalculator