Add some questions/TODOs