WIP: add support for try/catch
17 files changed