Revised some of Panu's work to use the global promise system, error handling and location service
Merge pull request #217 from kimardenmiller/added-proposal-sort-promise-and-location

Revised some of Panu's work ...