Divided phases, added TODOs