Adding another TODO
Cleaned up more TODOs