Added solar
Added sunspot and simple refactoring