More TODOs.
More TODOs.
Added a brief note on cyclic dependencies.