Started working on localization