Hopefully the finish of the language refactor