Begin reintroducing language support
WIP