I will add a TODO, as they need to be completed.