Removed the TODO; it's todone