dealing w/ language changes and getting things working.. suboptimal for now