Added first set of "obvious" TODOs