More work on Solar Calculator