new TODO items
Merge branch 'master' into beta