Added a TODO and additional comments