Rewrite functions to have "Context"s - View it on GitHub