Added location support *very dirty work*