Added bits to TODO.  Clean up before adding more