More TODOs and future plans.