Feature/locateward