location-class initialised

Doodledave
Merge origin/master