WIP on icinga rework