Added TODO's and changed to Fahrenheit values for temperature