Merge pull request #14 from SoylentGraham/PopTrack---desktop

Merge to master
Merge pull request #15 from SoylentGraham/PopTrack---desktop

merge from pop-track-desktop
Merge pull request #16 from SoylentGraham/PopTrack---desktop

Merge to master
Merge pull request #17 from SoylentGraham/PopTrack---desktop

Merge to master