added some TODO items