Deleted a TODO
Removed TODO
Test 2
Functions moved.