Merge pull request #13 from paulcox24/Eventful/WIP

Eventful/wip
Use current location shows loading now