Added some context to the todos