Refactoring to use a Setup class. This should allow for fakes later.