LOPO-2: Port some more methods from SelfLocalisation into Localisation Engine