Add sun and some selection stuff