BE location rename
First basically working prototype.