For reference, new location code - needs reviewing before moving into app.