Adding todos and a link to the original Redmine issue