Huge changeset for Medusa (keylocations)