Add todos for the near future