Done. Should be working now. All that's left is to test it with the
interpreter.