Added some TO-DO and comments