Removed TODO.
Moved code.
Removed TODO's
Build testing.