add todo [sorry for merge commit :( ]