Incorporating Melanies feedback, about 2/3 done