Adding a few TODOs