Put TODO comments where needed