Adding some questions and todos