@mortenvp what do you think about this solution for the todo?