remove logging
remove logging
moving things around, making some mocks