first commit
Merge https://github.com/mickpc/solar_new