Add a couple more TODO items before I forget...