Yup Fer. 

On another note. I finished the locations and the Vault 24 description (and shitty map) and all of it has been added to the OP.