Added a todo list for merging this branch to master...