Modules

Monkey patching with test mocking in mind