Fixed issues with build and added TODO list back.