Added location class, uploaded so Chloe has updated code to work on.