Add todo list
Make suitable for new pkg system