Most of translation draft in place