Added some extra info to the TODO.