Added todo list. Finalized merge.