Added LocationActivity, still work in process