Removed TODO, and added one..