cleaned up branches and code. moved localization to it's own repo