just adding a few TODO items