Updated to use Location class
Added Location class