Removed some of the TODO in the code.