Working CC without location services...
Merge branch 'bradley'