Feature/indicators map

Is this supposed to be removed?