Finish putting models in both language and problem