Features/location wrapper

boomz