Adding some comments and todos