Addressing comments in the PR

Added a faraday helper. This is a first pass for that, we'll probably
need more options and it'll evolve over time.

Addressed the comments from the Pull Request