Added some comments, todos