Moved scaffolding from maps.R