Optimized commit

Reduced the number of globals in code
moved listener locations
LL now has a new distance calculation using Location class