Annotate some TODOs in main