Updated the TODO somewhat