Added more todos (I think the last ones)