Move method to interface
Merge branch 'master' into la
Fix for vehicle locations