Included some TODOs, so I will not forget what is still missing