Starting to add in the changes that Michael suggested. Still have some more to go