Added some todos for the near future.