Addendum locale

NOT READY FOR MERGE

Need to fetch out media bits still