Update TODO with more detail of next few steps