Working on sunlight, commit to merge with pull request