Add some comments and TODOs.