TODO items have been taken care of