working on locating the unlocated.
Merge branch 'feature/unidentification' into feature/develop