To Do list for Phase-2