added some TODO items to be discussed