Added Todo and a few more comments