Adding some TODO items