updated TODO and added checklist