added TODO's to take care of