adding a few more TODO items