Add JUNKFILE and 2 more TODO items.

Clearly you want the JUNKFILE and these more things TODO.