TODO
Removing unnecessary try/catch
Laying some groundwork for ClientContext
TODO