Feature/indicators map

Ah ok - yea, the get only thing makes sense though.