Opening this here, because its supposed to be implemented here, need discussion first
Opening this here, because its supposed to be implemented here, need discussion first