Revert "Revert "Added functionality to location manager.""

This reverts commit 538858f9d5d6a58899b3c7b078f44bf102f73b4c.