Location Module + updates

Location Module + updates