Added a few more TODO items