Doing some of my own work
Final Comment Updates