Added some TODO commenting