Keep going on the pretty printing and starting to refactor the translation functions