Flesh out TODO's.