Added more things to the TODO