One last change and I think we're ready to merge. Please change these to the modern hash syntax and don't line up the values.