added TODO items for signals