adding a couple more TODO items