Added some comments, and TODOS