Addendum locale

~~NOT READY FOR MERGE~~

Ready for review/merge