Adding some TODOs removing some that were done