Additional commit. Updated TODO notes