This actually handles new locations. Refs #18