Feature/text entry lang

@swarajban, @jagill, check it out when you have a chance