Add some things to TODO