Dekstop version so far
Merge pull request #1 from ebarr/desktop-version

Dekstop version so far