I actually ended up re-doing the whole thing. Was planning on doing a post about it, and it needs some cleanup before working on more than two languages, but this is the idea: