updated script with more TODO items. Please address as you are able