finally sunlight app pull request

It's functioning just about to specifications