Added a few TODOs