Added some comments and todos