Adding initial Location scaffolding