making progress on TODO items