Fixing a little of Sorts and Ownership
Merge pull request #1 from JeffScaturro/Desktop

Fixing a little of Sorts and Ownership