Okay, made a better version w/ more named places.