Adds a few more TODO items