Added Location. Using this instead of Yr object. Also added methods: getName(), getCountry(), getType(), getLatLong()