818c - moveIfNecessary tuned
ImageLocator + TrainScanner drafts