Add more things to TODO