Removed 2 TODOs and added 1