Handle location as an attachment

(work in progress but shh...)