Added a few TODOs for the near future.