Re-plan TODO a bit after feedback on the beta