Good to Go!

I want the changes made in previous merge to be included in this!