Added some comments and a TODO