Add some comments and todos