Added locations, got image uploads working.