More work on location functionality using Chris' example