First draft of a TODO list.
Merge branch 'master' into develop/tracker-upload