Added things to TODO