Added localization (first steps)